Skip to content

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

解决冲突

parents 88318956 325715eb
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 24 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersService.java
View file @ f5ebc7f7
......@@ -37,7 +37,7 @@ public interface IFirefightersService {
BigScreen1VO getFireForceInfoByCode(String companyCode);
String getCompanyName(String bizOrgCode);
Map<String,Object> getCompanyName(String bizOrgCode);
List<Map<String, Object>> getUserInfoByYJYA(String bizOrgCode);
}
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
View file @ f5ebc7f7
......@@ -331,26 +331,32 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
}
@Override
public String getCompanyName(String bizOrgCode) {
public Map<String,Object> getCompanyName(String bizOrgCode) {
LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
lambda.eq(OrgUsr::getBizOrgCode, bizOrgCode);
lambda.eq(OrgUsr::getIsDelete, false);
OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
if (!ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
return orgUsr.getBizOrgName();
Map<String,Object> map = new HashMap<>();
map.put("bizOrgCode",orgUsr.getBizOrgCode());
map.put("bizOrgName",orgUsr.getBizOrgName());
return map;
} else {
return getCompanyNameById(orgUsr.getParentId());
}
}
private String getCompanyNameById(String id) {
private Map<String,Object> getCompanyNameById(String id) {
LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
lambda.eq(OrgUsr::getSequenceNbr, id);
lambda.eq(OrgUsr::getIsDelete, false);
OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
if (!ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
return orgUsr.getBizOrgName();
Map<String,Object> map = new HashMap<>();
map.put("bizOrgCode",orgUsr.getBizOrgCode());
map.put("bizOrgName",orgUsr.getBizOrgName());
return map;
} else {
return getCompanyNameById(orgUsr.getParentId());
}
......
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
View file @ f5ebc7f7
......@@ -3443,6 +3443,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
public String deleteFirefighters(Long userId){
QueryWrapper<Firefighters> firefightersQueryWrapper = new QueryWrapper<>();
Firefighters firefighters = iFirefightersService.getOne(firefightersQueryWrapper.eq("org_usr_id", userId).eq("is_delete", 0));
if(ObjectUtils.isEmpty(firefighters)){
return "0";
}
Long id = firefighters.getSequenceNbr();
//BUG 2761 判断人员删除时的逻辑 如果被选为队伍联系人则无法被删除 bykongfm
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/PersonIdentifyAspect.java
View file @ f5ebc7f7
......@@ -38,7 +38,7 @@ public class PersonIdentifyAspect {
@Autowired
private JcsFeign jcsFeignClient;
@Pointcut("execution(public * com.yeejoin.amos.*.business.controller..*(..))")
@Pointcut("execution(public * com.*.equipmanage.controller..*(..))")
public void userDate() {
}
......@@ -57,7 +57,9 @@ public class PersonIdentifyAspect {
if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HttpStatus.OK.value()) {
throw new RuntimeException(responseModel.getDevMessage());
}
ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(), ReginParams.PersonIdentity.class);
// ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(), ReginParams.PersonIdentity.class);
String s = JSONObject.toJSONString(responseModel.getResult());
ReginParams.PersonIdentity personIdentity = JSONObject.parseObject(s, ReginParams.PersonIdentity.class);
reginParam.setPersonIdentity(personIdentity);
redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParam));
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @ f5ebc7f7
......@@ -691,7 +691,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);
queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
queryWrapper.isNull(EquipmentSpecificAlarmLog::getConfirmType);
List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper().selectList(queryWrapper);
if(!logs.isEmpty()){
EquipmentSpecificAlarmLog log = logs.get(0);
......@@ -703,18 +702,21 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
x.setCleanTime(new Date());
x.setStatus(AlarmStatusEnum.HF.getCode());
if (!flag) {
x.setConfirmType(x.getType());
x.setConfirmTypeName(ConfirmAlamEnum.getTypeByCode(x.getType()));
String equipmentName = StringUtil.isNotEmpty(specific.getCode()) ? specific.getName() + "(" + specific.getCode() + ")" : specific.getName();
if (x.getType().equals(AlarmTypeEnum.PB.getCode())) {
x.setAlarmReason(equipmentName + "频繁故障/误报，将设备报警信息屏蔽。");
} else {
x.setAlarmReason(equipmentName + "引起设备报警");
// 若已经被确警处理过，此处不再做处理
if (StringUtils.isEmpty(x.getConfirmType())) {
x.setConfirmType(x.getType());
x.setConfirmTypeName(ConfirmAlamEnum.getTypeByCode(x.getType()));
String equipmentName = StringUtil.isNotEmpty(specific.getCode()) ? specific.getName() + "(" + specific.getCode() + ")" : specific.getName();
if (x.getType().equals(AlarmTypeEnum.PB.getCode())) {
x.setAlarmReason(equipmentName + "频繁故障/误报，将设备报警信息屏蔽。");
} else {
x.setAlarmReason(equipmentName + "引起设备报警");
}
x.setResolveResult(dateString + "系统收到设备复归（已消除）信号，系统自动处理。");
x.setConfirmUser("");
x.setConfirmUserName("系统自动处理");
x.setConfirmDate(date);
}
x.setResolveResult(dateString + "系统收到设备复归（已消除）信号，系统自动处理。");
x.setConfirmUser("");
x.setConfirmUserName("系统自动处理");
x.setConfirmDate(date);
}
x.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value);
if (!StringUtils.isEmpty(traceId)) {
......
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
View file @ f5ebc7f7
......@@ -524,19 +524,19 @@ public class FirefightersController extends BaseController {
// firefightersQueryWrapper2.eq("amos_user_id",reginParam.getUserModel().getUserId());
// Firefighters one = iFirefightersService.getOne(firefightersQueryWrapper2);
List<Map<String,Object>> list = new ArrayList<>();
Map<String,Object> bizOrgCodeAndBizOrgName = iFirefightersService.getCompanyName(bizOrgCode);
QueryWrapper<Firefighters> firefightersQueryWrapper1 = new QueryWrapper<>();
firefightersQueryWrapper1.like("biz_org_code", bizOrgCode);
firefightersQueryWrapper1.like("biz_org_code", bizOrgCodeAndBizOrgName.get("bizOrgCode"));
firefightersQueryWrapper1.eq("people_type", "1601");
firefightersQueryWrapper1.eq("is_delete", "0");
String companyName = iFirefightersService.getCompanyName(bizOrgCode);
List<Firefighters> firefighters = iFirefightersService.getBaseMapper().selectList(firefightersQueryWrapper1);
firefighters.stream().forEach(e -> {
Map<String, Object> map = new HashMap<>();
map.put("name", e.getName());
map.put("jobTitle", e.getJobTitle());
map.put("bizOrgName", companyName);
map.put("bizOrgCode", bizOrgCode);
map.put("bizOrgName", bizOrgCodeAndBizOrgName.get("bizOrgName"));
map.put("bizOrgCode", bizOrgCodeAndBizOrgName.get("bizOrgCode"));
map.put("amosUserId", e.getOrgUsrId());
map.put("personnelPhotos", e.getPersonnelPhotos());
list.add(map);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/SignServiceImpl.java
View file @ f5ebc7f7
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
import com.yeejoin.amos.boot.module.jcs.api.dto.SinStaticDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.Sign;
import com.yeejoin.amos.boot.module.jcs.api.mapper.SignMapper;
......@@ -26,6 +27,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 打卡记录服务实现类
......@@ -46,6 +48,8 @@ public class SignServiceImpl extends BaseService<SignDto,Sign,SignMapper> implem
@Value("${mqtt.topic.person.sign.zxj:sign/data/synZxj}")
private String personSignZxj;
@Autowired
FirefightersServiceImpl iFirefightersService;
/**
* 分页查询
*/
......@@ -120,7 +124,8 @@ public class SignServiceImpl extends BaseService<SignDto,Sign,SignMapper> implem
@Override
public Boolean saveSign(SignDto dot) {
Sign sign = new Sign();
int num = this.baseMapper.queryPersonNum(dot.getBizOrgCode());
Map<String,Object> bizOrgCodeAndBizOrgName = iFirefightersService.getCompanyName(dot.getBizOrgCode());
int num = this.baseMapper.queryPersonNum(bizOrgCodeAndBizOrgName.get("bizOrgCode").toString());
Bean.copyExistPropertis(dot,sign);
sign.setPersonOfDay(String.valueOf(num));
boolean save = this.save(sign);
......
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