Skip to content

Y
YeeAmosFireAutoSysRoot
Commit a195893f authored by tangwei's avatar tangwei
Browse files
Options

Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade

# Conflicts: # YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/AccidentTypeServiceImpl.java # YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskFactorServiceImpl.java # YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskLevelServiceImpl.java # YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
parents 0dbb31d9 40c05da8
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 115 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/RiskLevelController.java
View file @ a195893f
......@@ -44,7 +44,7 @@ public class RiskLevelController extends BaseController {
public CommonResponse queryRiskLevelPage(@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
Page<HashMap<String, Object>> list = iRiskLevelService.queryRiskLevelPage(param);
Page<HashMap<String, Object>> list = iRiskLevelService.queryRiskLevelPage(getToken(),getProduct(),getAppKey(),param);
return CommonResponseUtil.success(list);
}
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipPointServiceImpl.java
View file @ a195893f
......@@ -12,7 +12,6 @@ import com.yeejoin.amos.fas.core.common.request.CommonPageable;
import com.yeejoin.amos.fas.core.util.CommonResponse;
import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
import com.yeejoin.amos.fas.core.util.StringUtil;
import com.yeejoin.amos.fas.dao.entity.FireCar;
import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
import org.assertj.core.util.Lists;
import org.springframework.beans.factory.annotation.Autowired;
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskLevelServiceImpl.java
View file @ a195893f
package com.yeejoin.amos.fas.business.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.stereotype.Service;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.fas.business.dao.mapper.RiskLevelMapper;
import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
import com.yeejoin.amos.fas.business.service.intfc.IRiskLevelService;
import com.yeejoin.amos.fas.dao.entity.RiskLevel;
import com.yeejoin.amos.fas.dao.entity.RiskSource;
import com.yeejoin.amos.fas.exception.YeeException;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@Service("riskLevelService")
public class RiskLevelServiceImpl implements IRiskLevelService {
@Autowired
RiskLevelMapper riskLevelMapper;
@Autowired
IRiskLevelDao iRiskLevelDao;
@Autowired
IRiskSourceDao iRiskSourceDao;
@Override
public Page<HashMap<String, Object>> queryRiskLevelPage(CommonPageInfoParam param) {
long total = riskLevelMapper.countPageData(param);
List<HashMap<String, Object>> content = riskLevelMapper.queryRiskLevelPage(param);
StringBuffer sb = new StringBuffer();
for(HashMap<String, Object> map : content)
{
sb.append(map.get("createBy"));
sb.append(map.get(","));
}
sb.deleteCharAt(sb.length()-1);
FeignClientResult<List<AgencyUserModel>> resultSec = Privilege.agencyUserClient.queryByIds(sb.toString());
for(HashMap<String, Object> map : content)
{
String userId =String.valueOf(map.get("createBy")) ;
for(AgencyUserModel user : resultSec.getResult())
{
if(userId!=null&& userId.equals(user.getUserId()))
{
map.put("userName", user.getRealName());
break;
}
}
}
Page<HashMap<String, Object>> result = new PageImpl<>(content, param, total);
return result;
}
@Override
public void editRiskLevel(HashMap<String, Object> map) {
RiskLevel param = (RiskLevel) map.get("param");
String orgCode = map.get("org_code") == null ? "":map.get("org_code").toString();
String userId = map.get("user_id")== null ? "0":map.get("user_id").toString();
param.setOrgCode(orgCode);
param.setCreateBy(userId);
param.setCreateDate(new Date());
iRiskLevelDao.save(param);
}
@Override
public void detRiskLevel(Long[] param) {
//1.校验
for(Long id : param){
checkBeforeDet(id);
}
//2.删除
iRiskLevelDao.deleteAllByIds(param);
}
/**
* 删除前校验
* @param id
*/
private void checkBeforeDet(Long id) {
List<RiskSource> list = iRiskSourceDao.findByRiskLevelId(id);
if(null !=list && list.size() >0){
throw new YeeException("风险点"+list.get(0).getName()+"在使用中，不能删除");
}
}
@Override
public List<RiskLevel> queryRiskLevel(Long id) {
List<RiskLevel> list = new ArrayList<RiskLevel>();
if(null == id){
list = iRiskLevelDao.findAll();
}else{
list = iRiskLevelDao.findByEvaluationModelId(id);
}
return list;
}
@Override
public Long countRepeatData(RiskLevel param) {
// TODO Auto-generated method stub
return riskLevelMapper.countRepeatData(param);
}
}
package com.yeejoin.amos.fas.business.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.stereotype.Service;
import com.google.common.base.Joiner;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.fas.business.dao.mapper.RiskLevelMapper;
import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
import com.yeejoin.amos.fas.business.service.intfc.IRiskLevelService;
import com.yeejoin.amos.fas.dao.entity.RiskLevel;
import com.yeejoin.amos.fas.dao.entity.RiskSource;
import com.yeejoin.amos.fas.exception.YeeException;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@Service("riskLevelService")
public class RiskLevelServiceImpl implements IRiskLevelService {
@Autowired
RiskLevelMapper riskLevelMapper;
@Autowired
IRiskLevelDao iRiskLevelDao;
@Autowired
IRiskSourceDao iRiskSourceDao;
@Autowired
private RemoteSecurityService remoteSecurityService;
@Override
public Page<HashMap<String, Object>> queryRiskLevelPage(String toke,String product,String appKey,CommonPageInfoParam param) {
long total = riskLevelMapper.countPageData(param);
List<HashMap<String, Object>> content = riskLevelMapper.queryRiskLevelPage(param);
Set<String> userIdList = new HashSet<String>();
for(HashMap<String, Object> map : content)
{
userIdList.add(String.valueOf(map.get("createBy")));
}
Map<String, String> userMap = new HashMap<String,String>();
if(userIdList.size()>0)
{
List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
for (int i = 0; i < users.size(); i++) {
userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
}
}
content.forEach(e -> {
e.put("userName",userMap.get(String.valueOf(e.get("createBy"))));
});
Page<HashMap<String, Object>> result = new PageImpl<>(content, param, total);
return result;
}
@Override
public void editRiskLevel(HashMap<String, Object> map) {
RiskLevel param = (RiskLevel) map.get("param");
String orgCode = map.get("org_code") == null ? "":map.get("org_code").toString();
String userId = map.get("user_id")== null ? "0":map.get("user_id").toString();
param.setOrgCode(orgCode);
param.setCreateBy(userId);
param.setCreateDate(new Date());
iRiskLevelDao.save(param);
}
@Override
public void detRiskLevel(Long[] param) {
//1.校验
for(Long id : param){
checkBeforeDet(id);
}
//2.删除
iRiskLevelDao.deleteAllByIds(param);
}
/**
* 删除前校验
* @param id
*/
private void checkBeforeDet(Long id) {
List<RiskSource> list = iRiskSourceDao.findByRiskLevelId(id);
if(null !=list && list.size() >0){
throw new YeeException("风险点"+list.get(0).getName()+"在使用中，不能删除");
}
}
@Override
public List<RiskLevel> queryRiskLevel(Long id) {
List<RiskLevel> list = new ArrayList<RiskLevel>();
if(null == id){
list = iRiskLevelDao.findAll();
}else{
list = iRiskLevelDao.findByEvaluationModelId(id);
}
return list;
}
@Override
public Long countRepeatData(RiskLevel param) {
// TODO Auto-generated method stub
return riskLevelMapper.countRepeatData(param);
}
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IRiskLevelService.java
View file @ a195893f
......@@ -10,7 +10,7 @@ import com.yeejoin.amos.fas.dao.entity.RiskLevel;
public interface IRiskLevelService {
Page<HashMap<String, Object>> queryRiskLevelPage(CommonPageInfoParam param);
Page<HashMap<String, Object>> queryRiskLevelPage(String toke,String product,String appKey,CommonPageInfoParam param);
void editRiskLevel(HashMap<String, Object> map);
......
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