elink-star
/
epdc-cloud-custom-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

监控设备管理

origin/feature/monitoring
Jackwang 4 years ago
parent
bbff7e5303
commit
6b62133e5c
3 changed files with 75 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/security/dao/MonitoringDao.java
  2. 47
      epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/security/service/impl/MonitoringServiceImpl.java
  3. 26
      epdc-cloud-custom/src/main/resources/mapper/security/MonitoringDao.xml

8
epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/security/dao/MonitoringDao.java
View File

@ -18,8 +18,13 @@
package com.elink.esua.epdc.modules.security.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.MonitoringDTO;
import com.elink.esua.epdc.modules.security.entity.MonitoringEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 监控设备表
@ -30,4 +35,7 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface MonitoringDao extends BaseDao<MonitoringEntity> {
List<MonitoringDTO> getPageList(Map<String, Object> params);
MonitoringDTO selectDetailById(@Param("id") String id);
}

47
epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/security/service/impl/MonitoringServiceImpl.java
View File

@ -21,9 +21,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.MonitoringDTO;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.modules.feign.AdminFeignClient;
import com.elink.esua.epdc.modules.security.dao.MonitoringDao;
import com.elink.esua.epdc.modules.security.entity.MonitoringEntity;
import com.elink.esua.epdc.modules.security.redis.MonitoringRedis;
@ -49,13 +53,19 @@ public class MonitoringServiceImpl extends BaseServiceImpl<MonitoringDao, Monito
@Autowired
private MonitoringRedis monitoringRedis;
@Autowired
private AdminFeignClient adminFeignClient;
@Override
public PageData<MonitoringDTO> page(Map<String, Object> params) {
IPage<MonitoringEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, MonitoringDTO.class);
// IPage<MonitoringEntity> page = baseDao.selectPage(
// getPage(params, FieldConstant.CREATED_TIME, false),
// getWrapper(params)
// );
// return getPageData(page, MonitoringDTO.class);
IPage<MonitoringDTO> page = getPage(params);
List<MonitoringDTO> list = baseDao.getPageList(params);
return new PageData<>(list, page.getTotal());
}
@Override
@ -76,14 +86,26 @@ public class MonitoringServiceImpl extends BaseServiceImpl<MonitoringDao, Monito
@Override
public MonitoringDTO get(String id) {
MonitoringEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, MonitoringDTO.class);
MonitoringDTO result = baseDao.selectDetailById(id);
result.setAllDeptIdsShow(Arrays.asList(result.getAllDeptIds().split(",")));
return result;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(MonitoringDTO dto) {
MonitoringEntity entity = ConvertUtils.sourceToTarget(dto, MonitoringEntity.class);
Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(dto.getDeptId());
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
} else {
ParentAndAllDeptDTO deptDTO = parentResult.getData();
entity.setDeptName(deptDTO.getGrid());
entity.setAllDeptIds(deptDTO.getAllDeptIds());
entity.setAllDeptNames(deptDTO.getAllDeptNames());
entity.setParentDeptIds(deptDTO.getParentDeptIds());
entity.setParentDeptNames(deptDTO.getParentDeptNames());
}
insert(entity);
}
@ -91,6 +113,17 @@ public class MonitoringServiceImpl extends BaseServiceImpl<MonitoringDao, Monito
@Transactional(rollbackFor = Exception.class)
public void update(MonitoringDTO dto) {
MonitoringEntity entity = ConvertUtils.sourceToTarget(dto, MonitoringEntity.class);
Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(dto.getDeptId());
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
} else {
ParentAndAllDeptDTO deptDTO = parentResult.getData();
entity.setDeptName(deptDTO.getGrid());
entity.setAllDeptIds(deptDTO.getAllDeptIds());
entity.setAllDeptNames(deptDTO.getAllDeptNames());
entity.setParentDeptIds(deptDTO.getParentDeptIds());
entity.setParentDeptNames(deptDTO.getParentDeptNames());
}
updateById(entity);
}

26
epdc-cloud-custom/src/main/resources/mapper/security/MonitoringDao.xml
View File

@ -26,6 +26,32 @@
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<select id="getPageList" resultType="com.elink.esua.epdc.dto.MonitoringDTO">
SELECT *,
CASE state
WHEN '0' THEN '正常'
WHEN '1' THEN '故障'
else ''
end as stateName
FROM `epdc_monitoring`
where DEL_FLAG='0'
<if test="address != null and address != ''">
and address like '%${address}%'
</if>
<if test="state != null and state != ''">
and state =#{state}
</if>
<if test="deptId != null and deptId != ''">
and FIND_IN_SET(#{deptId},ALL_DEPT_IDS)
</if>
order by CREATED_TIME desc
</select>
<select id="selectDetailById" resultType="com.elink.esua.epdc.dto.MonitoringDTO">
select *
from epdc_monitoring
where DEL_FLAG='0'
and id=#{id}
</select>
</mapper>
Write Preview
Loading…
Cancel
Save