Skip to content

A
amos-boot-biz
Commit b1e78d84 authored by chenhao's avatar chenhao
Browse files
Options

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

parents b2bc73c6 4d761ee9
Hide whitespace changes
Inline Side-by-side
Showing with 601 additions and 123 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java
View file @ b1e78d84
......@@ -71,6 +71,35 @@ public interface EquipFeignClient {
@RequestMapping(value = "/car/list-all", method = RequestMethod.GET)
ResponseModel<Object> getFireCarListAll();
/**
* 获取本单位下车辆列表
*
* @return
*/
@RequestMapping(value = "/car/list-allpag", method = RequestMethod.GET)
ResponseModel<Object> equipmentCarList( @RequestParam Long teamId,
@RequestParam String name,
@RequestParam String code ,
@RequestParam String pageNum,
@RequestParam String pageSize,
@RequestParam Long id);
/**
* 车辆树
**/
@RequestMapping(value = "/equipment-category/tree/2", method = RequestMethod.GET)
ResponseModel<Object> gettree();
/**
* 获取个队伍下车辆统计
*
......
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 @ b1e78d84
......@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.utils.Menu;
import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
/**
......@@ -27,9 +28,9 @@ public interface IFirefightersService {
List<Menu> getFirefightersJobTitleCount() throws Exception;
void saveFirefighters(FirefightersInfoDto firefighters);
Firefighters selectByAmosOrgId(Long id);
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java
View file @ b1e78d84
......@@ -235,4 +235,8 @@ public interface IOrgUsrService {
List<OrgUsr> selectCompanyUsers(Long orgUnitId);
OrgUsr selectByAmosOrgId(Long id);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/UserCarDto.java 0 → 100644
View file @ b1e78d84
package com.yeejoin.amos.boot.module.jcs.api.dto;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
**/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "UserCarDto", description = "人与车")
public class UserCarDto extends BaseDto {
@TableField("amos_user_name")
private String amosUserName;
@TableField("amos_user_id")
private Long amosUserId;
@TableField("car_num")
private String carNum;
@TableField("car_id")
private Long carId;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/UserCar.java 0 → 100644
View file @ b1e78d84
package com.yeejoin.amos.boot.module.jcs.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 人员与车辆关系
*
*
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("jc_user_car")
public class UserCar extends BaseEntity {
private static final long serialVersionUID = 1L;
@TableField("amos_user_name")
private String amosUserName;
@TableField("amos_user_id")
private Long amosUserId;
@TableField("car_num")
private String carNum;
@TableField("car_id")
private Long carId;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/UserCarMapper.java 0 → 100644
View file @ b1e78d84
package com.yeejoin.amos.boot.module.jcs.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
import java.util.List;
import java.util.Map;
/**
*
*人员与车辆信息
*/
public interface UserCarMapper extends BaseMapper<UserCar> {
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IUserCarService.java 0 → 100644
View file @ b1e78d84
package com.yeejoin.amos.boot.module.jcs.api.service;
import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
import java.util.List;
import java.util.Map;
/**
*
*/
public interface IUserCarService {
UserCar selectByAmosUserId(Long id);
void add (UserCar userCar);
void delete (UserCar userCar);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/UserCarMapper.xml 0 → 100644
View file @ b1e78d84
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.UserCarMapper">
</mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerState.java
View file @ b1e78d84
......@@ -55,27 +55,27 @@ public interface LatentDangerState {
/**
* 提交整改资料
*/
提交整改资料("提交整改资料", "governFileSubmit", "governChargerConfirm","", "2"),
提交整改资料("提交整改资料", "governFileSubmit", "governChargerConfirm","", "3"),
/**
* 整改检查组长确认
*/
整改检查组长确认("整改检查组长确认", "governLeaderConfirm", "governChargerConfirm","governFileSubmit", "3"),
整改检查组长确认("整改检查组长确认", "governLeaderConfirm", "governChargerConfirm","governFileSubmit", "4"),
/**
* 整改检查负责人确认
*/
整改检查负责人确认("整改检查负责人确认", "governChargerConfirm", "governLeadershipConfirm","governFileSubmit", "3"),
整改检查负责人确认("整改检查负责人确认", "governChargerConfirm", "governLeadershipConfirm","governFileSubmit", "4"),
/**
* 整改检查分管领导确认(根据计划类型不同，分管领导确认完流程不同)
*/
整改检查分管领导确认("整改检查分管领导确认", "governLeadershipConfirm", "governLeaderReviewConfirm","governFileSubmit", "3"),
整改检查分管领导确认("整改检查分管领导确认", "governLeadershipConfirm", "governLeaderReviewConfirm","governFileSubmit", "4"),
/**
* 整改检查组长复查确认
*/
整改检查组长复查确认("整改检查组长复查确认", "governLeaderReviewConfirm", "governSecondReviewConfirm","governFileSubmit", "3"),
整改检查组长复查确认("整改检查组长复查确认", "governLeaderReviewConfirm", "governSecondReviewConfirm","governFileSubmit", "4"),
/**
* 整改二次审核确认
*/
整改二次审核确认("整改二次审核确认", "governSecondReviewConfirm", "endOfGovernance","governFileSubmit", "3"),
整改二次审核确认("整改二次审核确认", "governSecondReviewConfirm", "endOfGovernance","governFileSubmit", "4"),
/**
* 整改完毕
*/
......
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/AlertCalledMapper.xml
View file @ b1e78d84
......@@ -261,7 +261,7 @@
<select id="getTodayEmergencyCount" resultType="java.util.Map">
SELECT
COUNT(tz.alarm_type_code = '960') as sleepyTncidentTotal,
sum(case when tz.alarm_type_code = '960' then 1 else 0 end) as sleepyTncidentTotal,
sum(
CASE
WHEN
......@@ -412,9 +412,10 @@
AND field_code IN ('injured_num', 'die_num')
and tz_alert_form_value.is_delete=0
group by alert_called_id
)
) and alarm_type_code = '960' and is_delete=0
) tzs left join tcb_elevator te on tzs.equipment_id = te.sequence_nbr
where 1=1
and tzs.call_time >= (select current_date())
and (select date_add(current_date(), interval 1 day)) >= tzs.call_time
<if test="regionCode != null and regionCode != ''">
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @ b1e78d84
......@@ -18,6 +18,8 @@ import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
import com.yeejoin.amos.boot.module.command.biz.service.impl.RemoteSecurityService;
import com.yeejoin.amos.boot.module.common.api.dto.*;
import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
import com.yeejoin.amos.boot.module.common.api.service.IDutyCarService;
......@@ -40,13 +42,10 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
import com.yeejoin.amos.boot.module.jcs.api.dto.StateDot;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
import com.yeejoin.amos.boot.module.jcs.api.service.IAircraftService;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService;
import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
import com.yeejoin.amos.boot.module.jcs.api.service.*;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.PermissionModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -149,6 +148,11 @@ public class CommandController extends BaseController {
IDutyCarService iDutyCarService;
@Autowired
IotFeignClient iotFeignClient;
@Autowired
IUserCarService userCarService;
/**
* 警情列表
*
......@@ -1178,10 +1182,62 @@ public class CommandController extends BaseController {
@TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
@GetMapping(value = "equipmentCarList")
@ApiOperation(httpMethod = "GET", value = "车辆列表", notes = "车辆列表")
public ResponseModel<Object> equipmentCarList( String name,
String code ,
String pageNum,
String pageSize,
Boolean isNo ) {
//获取用户所属单位id
AgencyUserModel agencyUserModel= getUserInfo();
Long teamId=null;
// Firefighters orgUsr= firefightersService.selectByAmosOrgId(Long.valueOf(agencyUserModel.getUserId()));
// teamId=orgUsr!=null?Long.valueOf(orgUsr.getFireTeamId()):null;
Long id =null;
//获取用户已绑定车辆id、
UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
if(isNo!=null&&isNo){
id =userCar!=null?userCar.getAmosUserId():null;
}
ResponseModel<Object> data= equipFeignClient.equipmentCarList(teamId,name,code , pageNum,pageSize,id);
Map map =new HashMap();
map.put("select",userCar!=null?userCar.getAmosUserId():null);
map.put("data",data!=null?data.getResult():null);
return ResponseHelper.buildResponse(map);
}
@TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
@GetMapping(value = "gettree")
@ApiOperation(httpMethod = "GET", value = "车辆分类", notes = "车辆分类")
public ResponseModel<Object> gettree( ) {
ResponseModel<Object> data= equipFeignClient.gettree();
return ResponseHelper.buildResponse(data!=null?data.getResult():null);
}
@TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "adduserCar/{type}", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "增加绑定", notes = "增加绑定")
public ResponseModel<Object> adduserCar(@PathVariable String type,UserCar userCar ) {
AgencyUserModel agencyUserModel= getUserInfo();
userCar.setAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
userCar.setAmosUserName(agencyUserModel.getUserName());
if("1".equals(type)){
userCarService.add(userCar);
}else{
userCarService.delete(userCar);
}
return ResponseHelper.buildResponse(null);
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java
View file @ b1e78d84
......@@ -84,6 +84,9 @@ public class OrgPersonController {
public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo,
@PathVariable Long id) throws Exception {
OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
/*同步修改关联账号用户名 chenzhao*/
AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
OrgPersonVo.setAmosOrgCode(amosUser.getRealName());
iOrgUsrService.updateByIdOrgPerson(OrgPersonVo, id);
return ResponseHelper.buildResponse(null);
}
......
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 @ b1e78d84
......@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto;
import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.RegionModel;
......@@ -82,6 +83,16 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
firefighters.setFirefighters(firefighter);
}
@Override
public Firefighters selectByAmosOrgId(Long id) {
QueryWrapper<Firefighters> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("amos_user_id",id);
Firefighters firefighters = firefightersMapper.selectOne(queryWrapper);
return firefighters;
}
/**
* 导出列表
*/
......
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 @ b1e78d84
......@@ -1674,6 +1674,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
}
@Override
public OrgUsr selectByAmosOrgId(Long id) {
QueryWrapper<OrgUsr> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("amos_org_id",id);
OrgUsr orgUsr = orgUsrMapper.selectOne(queryWrapper);
return orgUsr;
}
@Override
public AgencyUserModel getAmosIdByOrgUserId(String orgUserId) throws Exception {
OrgUsr orgUsr = this.baseMapper.selectOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getSequenceNbr,
orgUserId));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
View file @ b1e78d84
......@@ -293,24 +293,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
alertCalledObjsDto.setAlertCalled(alertCalled);
alertCalledObjsDto.setAlertFormValue(alertFormValuelist);
//警情报送
AlertSubmitted alertSubmitted = new AlertSubmitted();
alertSubmitted.setAlertCalledId(alertCalled.getSequenceNbr());
alertSubmitted.setBusinessType(alertCalled.getAlarmType());
alertSubmitted.setBusinessTypeCode(alertCalled.getAlarmTypeCode());
alertSubmitted.setSubmissionTime(new Date());
// 获取接警情况模板
List<Template> templateList =
templateMapper.selectList(new LambdaQueryWrapper<Template>().eq(Template::getFormat, false).like(Template::getTypeCode,
DutyInfoEnum.接警情况.getKey() + "-"));
Map<String, Template> templateMap = templateList.stream().collect(Collectors.toMap(Template::getTypeCode,
Function.identity()));
//增加非空判断 cz 2021-10-08
if ( alertCalled.getAlertTypeCode() != null) {
String tempContent =
templateMap.get(DutyInfoEnum.接警情况.getKey() + "-" + alertCalled.getAlertTypeCode()).getContent();
alertSubmitted.setSubmissionContent(replaceTemplate(tempContent, Bean.BeantoMap(alertCalled)));
};
alertSubmittedService.save(alertSubmitted);
//调用规则
ruleAlertCalledService.fireAlertCalledRule(alertCalledObjsDto);
//通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
......@@ -465,7 +447,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
}
@Override
public Map<String, Object> selectAlertCalledKeyValueLabelById(Long id) {
public Map<String, Object> selectAlertCalledKeyValueLabelById(Long id) {
// 警情基本信息
AlertCalled alertCalled = this.getById(id);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/UserCarServiceImpl.java 0 → 100644
View file @ b1e78d84
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
import com.yeejoin.amos.boot.module.jcs.api.enums.AircraftFileTypeEnum;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AircraftMapper;
import com.yeejoin.amos.boot.module.jcs.api.mapper.UserCarMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAircraftService;
import com.yeejoin.amos.boot.module.jcs.api.service.IUserCarService;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
import org.apache.commons.collections.map.HashedMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.exception.BaseException;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.StringUtil;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 航空器信息服务实现类
*
* @author system_generator
* @date 2021-06-29
*/
@Service
public class UserCarServiceImpl extends BaseService<AircraftDto, UserCar, UserCarMapper> implements IUserCarService {
@Autowired
UserCarMapper UserCarMapper;
@Override
public UserCar selectByAmosUserId(Long id) {
QueryWrapper<UserCar> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("amos_user_id", id);
return UserCarMapper.selectOne(queryWrapper);
}
@Override
public void add(UserCar userCar) {
QueryWrapper<UserCar> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("amos_user_id", userCar.getAmosUserId());
UserCar uer= UserCarMapper.selectOne(queryWrapper);
if(uer!=null){
userCar.setSequenceNbr(uer.getSequenceNbr());
UserCarMapper.updateById(userCar);
}else{
UserCarMapper.insert(userCar);
}
}
@Override
public void delete(UserCar userCar) {
QueryWrapper<UserCar> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("amos_user_id", userCar.getAmosUserId());
UserCarMapper.delete(queryWrapper);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/dao/mapper/LatentDangerMapper.java
View file @ b1e78d84
......@@ -29,7 +29,7 @@ public interface LatentDangerMapper extends BaseMapper<LatentDanger> {
LatentDangerBo getByInstanceId(String instanceId);
List<LatentDangerBo> listOfOvertime();
List<LatentDangerBo> listOfOvertime(@Param("dangerStateList") List<String> dangerStateList);
Integer countNotFinishByFlowId(String flowId);
......@@ -79,5 +79,5 @@ public interface LatentDangerMapper extends BaseMapper<LatentDanger> {
* @param paramMap
* @return
*/
IPage<LatentDanger> selectPageByParam(Page<LatentDanger> page, @Param("paramMap") Map<String, Object> paramMap);
IPage<LatentDanger> selectPageByParam(@Param("page") Page<LatentDanger> page, @Param("paramMap") Map<String, Object> paramMap);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java
View file @ b1e78d84
......@@ -83,6 +83,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static com.yeejoin.amos.latentdanger.business.util.RandomUtil.buildOrderNo;
import static org.typroject.tyboot.core.foundation.context.RequestContext.getProduct;
......@@ -273,11 +274,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
// LatentDangerPatrolBo patrolBo = latentDangerPatrolMapper.getByDangerId(latentDanger.getId());
// sendMessage(latentDanger, LatentDangerExecuteTypeEnum.填写隐患完成, patrolBo,
// "巡检隐患排查与治理", this.getNextExecuteUsers(latentDanger.getInstanceId()), userRealName, departmentName);
try {
webMqttComponent.publish(dangerTopic, "");
} catch (Exception e) {
logger.error("巡检隐患提交数字换流站页面推送失败-----------" + e.getMessage());
}
// try {
// webMqttComponent.publish(dangerTopic, "");
// } catch (Exception e) {
// logger.error("巡检隐患提交数字换流站页面推送失败-----------" + e.getMessage());
// }
dangerList.add(latentDanger);
}
......@@ -981,7 +982,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
dangerState = "taskDispatch,governFileSubmit,governLeaderConfirm,governChargerConfirm," +
"governLeadershipConfirm,governLeaderReviewConfirm,governSecondReviewConfirm";
}
List<LatentDangerBo> overtimeList = latentDangerMapper.listOfOvertime();
List<String> dangerStateList = Lists.newArrayList(dangerState.split(","));
List<LatentDangerBo> overtimeList = latentDangerMapper.listOfOvertime(dangerStateList);
LambdaQueryWrapper<LatentDanger> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper
List<LatentDanger> overtimeDangerList = this.baseMapper.selectList(queryWrapper);
......@@ -1254,8 +1256,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
if (("supervised".equals(planType) &&
LatentDangerState.SupervisionDangerStateEnum.整改检查分管领导确认.getCode().equals(currentDangerState))
|| LatentDangerState.SupervisionDangerStateEnum.整改二次审核确认.getCode().equals(currentDangerState)) {
latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.整改完毕.getCode());
latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.整改完毕.getName());
nextState = LatentDangerState.SupervisionDangerStateEnum.整改完毕.getCode();
nextStateName = LatentDangerState.SupervisionDangerStateEnum.整改完毕.getName();
}
executeResultMsg = currentStateEnum.getName() + ExecuteTypeEnum.通过.getName();
} else {
......@@ -1799,16 +1801,32 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
}
}
if (!ValidationUtil.isEmpty(pageParam.get("dangerState"))) {
List<String> state = Lists.newArrayList(((String) pageParam.get("dangerState")).split(","));
pageParam.put("dangerState", state);
if (!ValidationUtil.isEmpty(pageParam.get("dangerState")) || pageParam.get("dangerState") == "") {
if (ValidationUtil.isEmpty(pageParam.get("dangerState"))) {
pageParam.put("dangerState", null);
} else {
List<String> state = Lists.newArrayList(((String) pageParam.get("dangerState")).split(","));
pageParam.put("dangerState", state);
}
}
if (!ValidationUtil.isEmpty(dangerIdList)) {
pageParam.put("dangerIds", dangerIdList);
}
Page page = new Page();
if (pageParam.get("current") instanceof String && pageParam.get("size") instanceof String) {
int current = Integer.valueOf((String) pageParam.get("current"));
int size = Integer.valueOf((String) pageParam.get("current"));
page.setCurrent(current);
page.setSize(size);
} else {
page.setCurrent((Integer)(pageParam.get("current")));
page.setSize((Integer)(pageParam.get("size")));
}
if (ValidationUtil.isEmpty(pageParam.get("order"))) {
pageParam.put("order", "1");
}
IPage<LatentDanger> iPage = this.baseMapper.selectPageByParam(new Page(((Integer) pageParam.get("current")).longValue(),
((Integer) pageParam.get("size")).longValue()), (Map<String, Object>) pageParam);
IPage<LatentDanger> iPage = this.baseMapper.selectPageByParam(page, (Map<String, Object>) pageParam);
Map<String, Object> buildingAbsolutePositionMap = new HashMap<>();
if (!ValidationUtil.isEmpty(iPage.getRecords())) {
try {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/async/AsyncTask.java
View file @ b1e78d84
......@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.MessageModel;
import com.yeejoin.amos.latentdanger.business.param.JPushTypeEnum;
import com.yeejoin.amos.latentdanger.business.param.PushMsgParam;
import com.yeejoin.amos.latentdanger.business.util.Toke;
......@@ -92,7 +94,10 @@ public class AsyncTask {
if (pointName != null) {
body += "关联检查点：" + pointName + TAB;
}
saveAndSendMsg(orgCode, informerList, msgTypeEnum.getTitle(), body, msgTypeEnum.getMsgType(), riskFactorId, null, "");
MessageModel messageModel = new MessageModel();
messageModel.setBody(body);
// Systemctl.messageClient.create(messageModel);
// saveAndSendMsg(orgCode, informerList, msgTypeEnum.getTitle(), body, msgTypeEnum.getMsgType(), riskFactorId, null, "");
}
private void saveAndSendMsg(String orgCode, String informerList,
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java
View file @ b1e78d84
......@@ -395,7 +395,7 @@ public class ElevatorController extends BaseController {
IPage<Elevator> elevatorPage = new Page<>();
Integer count = elevatorService.count();
for(int i = 0; i <= (ValidationUtil.isEmpty(num) ? count : num); i ++ ) {
for(int i = 0; i <= (ValidationUtil.isEmpty(num) ? count%500 : num); ++i ) {
elevatorPage.setCurrent(i);
elevatorPage.setSize(500);
elevatorPage = elevatorService.page(elevatorPage);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java
View file @ b1e78d84
......@@ -42,7 +42,10 @@ import com.yeejoin.amos.boot.module.tzs.api.service.IRescueStationService;
import com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService;
import com.yeejoin.amos.boot.module.tzs.biz.controller.WechatController;
import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.slf4j.Logger;
......@@ -586,7 +589,6 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
data.put("first","电梯困人任务已派遣，请尽快前往救援!");
data.put("keyword1",alertCalled.getAddress());
data.put("keyword2", DateUtils.date2LongStr(dispatchTaskDto.getDispatchTime()));
data.put("keyword3", alertCalled.getEmergencyCall());
data.put("remark", "请在收到任务后30分钟内到达人员被困位置进行救援！");
temp.setData(data);
} else if(AlertStageEnums.GZWX.getId().equals(dispatchTaskDto.getAlertCode())) {
......@@ -603,6 +605,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
} else if(AlertStageEnums.TSZX.getId().equals(dispatchTaskDto.getAlertCode())) {
temp.setTemplateId(TS_TEMPID);
temp.setUrl(TS_URL+ "?id=" + dispatchTaskDto.getSequenceNbr());
data.put("first","投诉建议任务已派遣，请尽快前往救援!");
data.put("keyword1","投诉建议");
data.put("keyword2", "投诉建议");
data.put("keyword3", alertCalled.getEmergencyPerson());
data.put("keyword4", alertCalled.getEmergencyCall());
data.put("keyword5", DateUtils.date2LongStr(dispatchTaskDto.getDispatchTime()));
data.put("remark", "任务已派遣，请尽快前往处置！");
temp.setData(data);
}
return temp;
......@@ -900,12 +909,22 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
rescueProcessServiceImpl.updateByAlertId(rescueProcessDto);
}
}
// 发送任务单
WechatRelation temp = wechatRelationServiceImpl.getOne(new LambdaQueryWrapper<WechatRelation>().eq(WechatRelation::getPhone,dispatchTaskDto.getResponseUserTel()));
if(temp != null && temp.getOpenId() != null) {
dispatchTaskDto.setSequenceNbr(dispatchTask.getSequenceNbr());
WechatMessageDto dto = this.getWechatMessageDtoByDispatchTaskDto(dispatchTaskDto);
wechatService.sendWechatModelMessage(temp.getOpenId() , dto);
String infoCode = dispatchTaskDto.getDispatchInfoCode();
if(infoCode.indexOf("0") != -1 && StringUtils.isNotBlank(dispatchTaskDto.getResponseUserTel())) { // 下发了小程序
// 发送任务单
WechatRelation temp = wechatRelationServiceImpl.getOne(new LambdaQueryWrapper<WechatRelation>().eq(WechatRelation::getPhone,dispatchTaskDto.getResponseUserTel()));
if(temp != null && temp.getOpenId() != null) {
dispatchTaskDto.setSequenceNbr(dispatchTask.getSequenceNbr());
WechatMessageDto dto = this.getWechatMessageDtoByDispatchTaskDto(dispatchTaskDto);
wechatService.sendWechatModelMessage(temp.getOpenId() , dto);
}
}
if(infoCode.indexOf("1") != -1 && StringUtils.isNotBlank(dispatchTaskDto.getResponseUserTel())) { // 下发了短信
/*HashMap<String, String> params = new HashMap<>();
params.put("smsCode","SMS_JCS_0001");
params.put("mobile",dispatchTaskDto.getResponseUserTel());
params.put("address","测试传参短信通知");
FeignClientResult<SmsRecordModel> result = Systemctl.smsClient.sendCommonSms(params);*/
}
// mqtt 通知新派遣
JSONObject jsonObject = new JSONObject();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ESElevatorServiceImpl.java
View file @ b1e78d84
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.EsElevatorDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
......@@ -16,10 +17,14 @@ import org.springframework.data.elasticsearch.core.SearchHit;
import org.springframework.data.elasticsearch.core.SearchHits;
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
/**
*
......@@ -64,17 +69,7 @@ public class ESElevatorServiceImpl {
public EsElevator saveEsElevatorToES(Elevator elevator)
{
EsElevator esElevator = new EsElevator();
esElevator.setSequenceNbr(elevator.getSequenceNbr());
esElevator.setProvince(elevator.getProvince());
esElevator.setAddress(elevator.getAddress());
esElevator.setCity(elevator.getCity());
esElevator.setDistrict(elevator.getDistrict());
esElevator.setLatitude(elevator.getLatitude());
esElevator.setLongitude(elevator.getLongitude());
esElevator.setRegisterCode(elevator.getRegisterCode());
esElevator.setRegionCode(elevator.getRegionCode());
esElevator.setRescueCode(elevator.getRescueCode());
Bean.toPo(elevator,esElevator);
esElavtorRepository.save(esElevator);
return esElevator;
}
......@@ -93,6 +88,7 @@ public class ESElevatorServiceImpl {
String address = elevatorDto.getAddress();
String regionCode = elevatorDto.getRegionCode();
String alertId = elevatorDto.getAlertId();
Long equipmentId = elevatorDto.getSequenceNbr();
/**
* 通用匹配规则，条件构建
......@@ -102,31 +98,33 @@ public class ESElevatorServiceImpl {
BoolQueryBuilder qb0 = QueryBuilders.boolQuery();
LambdaQueryWrapper<AlertCalled> queryWrapper = new LambdaQueryWrapper();
if(!ValidationUtil.isEmpty(alarmTypeCode)) {
if(!ValidationUtil.isEmpty(alarmTypeCode) && !"all".equals(alarmTypeCode)) {
queryWrapper.eq(AlertCalled::getAlarmTypeCode,alarmTypeCode);
}
AlertCalled alertCalled = null;
List<AlertCalled> alertCalleds = null;
// if(!ValidationUtil.isEmpty(alertId)) {
// alertCalled = iAlertCalledService.getById(elevatorDto.getAlertId());
// BoolQueryBuilder qb4 = QueryBuilders.boolQuery();
// qb4.must(QueryBuilders.termQuery("sequenceNbr", alertCalled.getEquipmentId()));
// boolMust.must(qb4);
// } else {
// if(elevatorDto.getIsToday() != null && elevatorDto.getIsToday()) {
// queryWrapper.ge(AlertCalled::getCallTime, DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_PATTERN));
// queryWrapper.le(AlertCalled::getCallTime, DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
// }
// alertCalleds = iAlertCalledService.list(queryWrapper);
// List<Long> stringList = new ArrayList<>();
// for (AlertCalled al: alertCalleds
// ) {
// stringList.add(al.getEquipmentId());
// }
// List<Long> listL = stringList.stream().distinct().collect(Collectors.toList());
// qb0.should(QueryBuilders.termsQuery("sequenceNbr", listL.toArray()));
// boolMust.must(qb0);
// }
if(!ValidationUtil.isEmpty(alertId)) {
alertCalled = iAlertCalledService.getById(elevatorDto.getAlertId());
BoolQueryBuilder qb4 = QueryBuilders.boolQuery();
qb4.must(QueryBuilders.termQuery("sequenceNbr", alertCalled.getEquipmentId()));
boolMust.must(qb4);
} else {
if(!ValidationUtil.isEmpty(alarmTypeCode)) {
if(elevatorDto.getIsToday() != null && elevatorDto.getIsToday()) {
queryWrapper.ge(AlertCalled::getCallTime, DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_PATTERN));
queryWrapper.le(AlertCalled::getCallTime, DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
}
alertCalleds = iAlertCalledService.list(queryWrapper);
List<Long> stringList = new ArrayList<>();
for (AlertCalled al: alertCalleds
) {
stringList.add(al.getEquipmentId());
}
List<Long> listL = stringList.stream().distinct().collect(Collectors.toList());
qb0.should(QueryBuilders.termsQuery("sequenceNbr", listL.toArray()));
boolMust.must(qb0);
}
}
if(!ValidationUtil.isEmpty(address)) {
......@@ -143,6 +141,12 @@ public class ESElevatorServiceImpl {
boolMust.must(qb2);
}
if(!ValidationUtil.isEmpty(equipmentId)) {
BoolQueryBuilder qb3= QueryBuilders.boolQuery().
filter(QueryBuilders. termQuery("sequenceNbr", equipmentId));
boolMust.must(qb3);
}
// 创建查询构造器
NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder()
// 分页
......@@ -161,20 +165,21 @@ public class ESElevatorServiceImpl {
{
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
EsElevatorDto esElevatorDto =JSONObject.toJavaObject(jsonObject, EsElevatorDto.class);
list.add(esElevatorDto);
// if(null != alertCalleds) {
// for (AlertCalled al: alertCalleds
// ) {
// if(al.getEquipmentId().equals(esElevatorDto.getSequenceNbr())) {
// esElevatorDto.setHappenTime(al.getCallTime());
// esElevatorDto.setAlertId(String.valueOf(al.getSequenceNbr()));
// esElevatorDto.setAlarmTypeCode(al.getAlarmTypeCode());
// esElevatorDto.setType(al.getAlertStage());
// list.add(esElevatorDto);
// break;
// }
// }
// }
if(null != alertCalleds) {
for (AlertCalled al: alertCalleds
) {
if(al.getEquipmentId().equals(esElevatorDto.getSequenceNbr())) {
esElevatorDto.setHappenTime(al.getCallTime());
esElevatorDto.setAlertId(String.valueOf(al.getSequenceNbr()));
esElevatorDto.setAlarmTypeCode(al.getAlarmTypeCode());
esElevatorDto.setType(al.getAlertStage());
list.add(esElevatorDto);
break;
}
}
} else {
list.add(esElevatorDto);
}
}
}
catch (Exception e)
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ b1e78d84
......@@ -1710,5 +1710,57 @@
</sql>
</changeSet>
<changeSet author="chenzhao" id="2021-10-13">
<preConditions onFail="MARK_RAN">
<viewExists viewName="alert_today"/>
</preConditions>
<dropView viewName="alert_today"/>
<comment>delete alert_today</comment>
</changeSet>
<changeSet author="chenzhao" id="2021-10-13-2">
<createView viewName="alert_today" replaceIfExists="true" >
select '今日接警' AS `title`,count(`jc_alert_called`.`alert_status`) AS `alert_count` from `jc_alert_called` where (to_days(`jc_alert_called`.`call_time`) = to_days(now())) union all
<![CDATA[select '已处警' AS `title`,count(`jc_alert_called`.`alert_status`) AS `alert_count` from `jc_alert_called`,jc_power_transfer where ((to_days(`jc_alert_called`.`call_time`) = to_days(now()) and jc_power_transfer.alert_called_id = jc_alert_called.sequence_nbr ) and (`jc_alert_called`.`alert_stage` <> '警情接报')) union all]]> select '未结案' AS `title`,count(`jc_alert_called`.`alert_status`) AS `alert_count` from `jc_alert_called` where (`jc_alert_called`.`alert_status` = 0) union all
select '已结案' AS `title`,count(`jc_alert_called`.`alert_status`) AS `alert_count` from `jc_alert_called` where ((year(`jc_alert_called`.`call_time`) = year(now())) and (`jc_alert_called`.`alert_status` = 1));
</createView>
</changeSet>
<changeSet author="tw" id="2021-10-13-tw-01">
<preConditions onFail="MARK_RAN">
<not>
<tableExists tableName="jc_user_car"/>
</not>
</preConditions>
<comment>create table jc_user_car</comment>
<sql>
CREATE TABLE `jc_user_car` (
`sequence_nbr` bigint(20) NOT NULL COMMENT '物理主键',
`amos_user_name` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '平台账号',
`amos_user_id` bigint(20) NULL DEFAULT NULL COMMENT '平台账号id',
`car_num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '车牌号',
`car_id` bigint(20) NULL DEFAULT NULL COMMENT '车辆id',
`rec_user_name` varchar(15) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作人名称',
`rec_user_id` varchar(19) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作人员',
`rec_date` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '创建时间',
`is_delete` bit(1) NULL DEFAULT b'0' COMMENT '是否删除',
PRIMARY KEY (`sequence_nbr`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
</sql>
</changeSet>
</databaseChangeLog>
amos-boot-system-latentdanger/src/main/resources/application-dev.properties
View file @ b1e78d84
......@@ -8,6 +8,7 @@ eureka.instance.lease-expiration-duration-in-seconds=10
eureka.instance.lease-renewal-interval-in-seconds=5
eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
eureka.instance.status-page-url-path=/actuator/info
eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
ribbon.eureka.enabled = true
ribbon.ConnectTimeout = 5000
......
amos-boot-system-latentdanger/src/main/resources/db/changelog/latent-danger-1.0.0.xml
View file @ b1e78d84
......@@ -6,4 +6,13 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
<changeSet id="20211013-1" author="tb">
<preConditions>
<columnExists tableName="p_latent_danger" columnName="biz_info" />
</preConditions>
<comment>修改业务信息字段biz_info字段类型为text</comment>
<sql>
ALTER TABLE p_latent_danger MODIFY COLUMN biz_info text DEFAULT NULL COMMENT '业务信息'
</sql>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml
View file @ b1e78d84
......@@ -254,6 +254,22 @@
select * from p_latent_danger where deleted = 0 and instance_id = #{instanceId} and danger_state = 3 limit 1
</select>
<select id="listOfOvertime"
resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo">
select *
from p_latent_danger
where now() > reform_limit_date
and overtime_state = 0
and deleted = 0
<if test="dangerStateList != null and dangerStateList.size() > 0">
and danger_state in
<foreach collection="dangerStateList" item="dangerState" open="(" separator="," close=")">
#{dangerState}
</foreach>
</if>
</select>
<select id="listByMap" resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo">
select
a.*
......@@ -350,10 +366,6 @@
</where>
</select>
<select id="listOfOvertime" resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo">
select * from p_latent_danger where now()>reform_limit_date and overtime_state = 0 and deleted = 0 and danger_state in (2,3,4)
</select>
<select id="countNotFinishByFlowId" resultType="java.lang.Integer">
select
count(1)
......@@ -417,7 +429,7 @@
INTERVAL 8 HOUR)), ld.reform_limit_date ) -- 截止日期到当天早上8:00:00分钟数
AND ld.overtime_state = 0
AND ld.deleted = 0
<if test="dangerState != null and dangerState != ''" >
<if test="dangerState != null and dangerState != ''">
AND ld.danger_state in (#{dangerState});
</if>
......@@ -960,7 +972,7 @@
#{id}
</foreach>
</if>
<if test="key == 'dangerState' and value != null">
<if test="key == 'dangerState' and value != null and !value.isEmpty()">
and a.danger_state IN
<foreach collection="value" item="state" open="(" separator="," close=")">
#{state}
......@@ -981,7 +993,7 @@
<if test="key == 'reformType' and value != null and value != ''">
and a.reform_type = #{value}
</if>
<if test="key == 'structureIdList' and value != null">
<if test="key == 'structureIdList' and value != null and value != ''">
and a.structure_id in
<foreach collection="value" item="structureId" open="(" separator="," close=")">
#{structureId}
......
amos-boot-system-tzs/src/main/resources/application-dev.properties
View file @ b1e78d84
......@@ -42,9 +42,7 @@ tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
tzs.cti.url=http://36.46.151.113:8000
tzs.wechat.url=https://api.weixin.qq.com
##wechatAPPID wx79aca5bb1cb4af92 uat-wx8918c1aaad956617
tzs.wechat.appid=wx8918c1aaad956617
##wechatSECRET f3a12323ba731d282c3d4698c27c3e97 uat-337c3d8f3e749140d4f9aedc8311033b
tzs.wechat.secret=337c3d8f3e749140d4f9aedc8311033b
##wechatToken
......@@ -52,12 +50,12 @@ tzs.wechat.token=yeejoin_2021
##wechatTicketUrl
tzs.wechat.ticketurl=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
tzs.wechat.tempId.kr=Hlu43OOCVTESzOtkP4we1AUZJoPfquZl2_DEn6U66Z4
tzs.wechat.tempId.kr=rjW8x9rRitIpa21Jekyx2nzBzpJy7tycssCXSN4YhWw
tzs.wechat.url.kr=tzs.yeeamos.com/persondetail.html
tzs.wechat.tempId.wx=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
tzs.wechat.tempId.wx=ofBIZS8Bup9s0zKbrGa8BfhVhS18H_hyC_OYXuBN6hI
tzs.wechat.url.wx=tzs.yeeamos.com/repairPersondetail.html
tzs.wechat.tempId.ts=SLjmNJoCNLC3FBcYzWzR-u3el0kqXf8WMTmzw8dAQm4
tzs.wechat.url.ts=tzs.yeeamos.com/persondetail.html
tzs.wechat.tempId.ts=Kr7lcV8g4g_lgyW_RpwnNgw_HDxxRuVx759EoFWrIfU
tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
mqtt.topic.task.newtask=tzs-task-newtask
......
amos-boot-system-tzs/src/main/resources/application-qa.properties
View file @ b1e78d84
#DB properties:
spring.datasource.url=jdbc:mysql://172.16.10.66:3306/safety-business-3.0.0?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://113.134.211.174:3306/xiy_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=root_123
\ No newline at end of file
spring.datasource.password=Yeejoin@2020
##eureka properties:
eureka.client.service-url.defaultZone =http://113.134.211.174:10001/eureka/
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
eureka.instance.health-check-url=http://192.168.0.204:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
eureka.instance.status-page-url=http://192.168.0.204:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://192.168.0.204:${server.port}${server.servlet.context-path}/swagger-ui.html
## ES properties:
biz.elasticsearch.address=192.168.0.204
spring.data.elasticsearch.cluster-name=elasticsearch
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
## unit(h)
alertcall.es.synchrony.time=48
#redis properties:
spring.redis.database=1
spring.redis.host=113.134.211.174
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
## emqx properties:
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://113.134.211.174:1883
emqx.user-name=admin
emqx.password=public
tzs.cti.appkey=4e805006-3fef-ae43-3915-a153731007c4
tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
tzs.cti.url=http://36.46.151.113:8000
tzs.wechat.url=https://api.weixin.qq.com
tzs.wechat.appid=wx79aca5bb1cb4af92
tzs.wechat.secret=f3a12323ba731d282c3d4698c27c3e97
##wechatToken
tzs.wechat.token=yeejoin_2021
##wechatTicketUrl
tzs.wechat.ticketurl=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
tzs.wechat.tempId.kr=bxchKYhYW7aHbGKM2pVyR_yY2-bG4sRMNU3ZRQbMKYM
tzs.wechat.url.kr=tzs.yeeamos.com/persondetail.html
tzs.wechat.tempId.wx=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
tzs.wechat.url.wx=tzs.yeeamos.com/repairPersondetail.html
tzs.wechat.tempId.ts=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
mqtt.topic.task.newtask=tzs-task-newtask
mqtt.topic.task.personinfo=tzs-task-personinfo
mqtt.topic.elevator.push=/tzs/tcb_elevator
mqtt.topic.alertInfo.push=/tzs/tcb_alertInfo
mqtt.topic.alertReport.push=/tzs/tcb_alertReport
mqtt.topic.alertHeart.push=/tzs/tcb_alertHeart
mqtt.topic.alertMatrix.push=/tzs/tcb_alertMatrix
pom.xml
View file @ b1e78d84
......@@ -207,7 +207,7 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-systemctl</artifactId>
<version>1.6.3-SNAPSHOT</version>
<version>1.6.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
......
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