Skip to content

A
amos-boot-biz
Commit 89342b18 authored by tianyiming's avatar tianyiming
Browse files
Options

1、96333警情填报-填报

2、96333警情填报-报送
parent 51c5b9e7
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 52 deletions
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/entity/AlertCalled.java
View file @ 89342b18
......@@ -225,7 +225,7 @@ public class AlertCalled extends BaseEntity {
@TableField("equipment_id")
@ApiModelProperty(value = "设备id")
private Long equipmentId;
private String equipmentId;
@TableField(exist=false)
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/ElevatorMapper.java
View file @ 89342b18
......@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
import java.util.Map;
/**
* Mapper 接口
......@@ -34,4 +35,6 @@ public interface ElevatorMapper extends BaseMapper<Elevator> {
List<ElevatorDto> selectExportData(@Param("ids") List<String> ids);
@Select("select * from tcb_elevator where address like concat('%',#{address},'%')")
List<ElevatorDto> getAddressList(String address);
Map<String,Object> selectElevatorList(@Param("elevator") Elevator elevator);
}
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/service/IElevatorService.java
View file @ 89342b18
......@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDto;
import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
import java.util.List;
import java.util.Map;
/**
* 服务类
......@@ -28,4 +29,6 @@ public interface IElevatorService extends IService<Elevator> {
String saveElevatorQrCode(Long elevatorId);
List<ElevatorDto> selectExportData(String exportId);
Map<String,Object> selectElevatorList(Elevator elevator);
}
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/ElevatorMapper.xml
View file @ 89342b18
......@@ -94,4 +94,30 @@
</if>
</select>
<select id="selectElevatorList" resultType="java.util.Map">
SELECT
jui.RECORD AS sequenceNbr,
ifnull ( joi.CODE96333, '' ) AS rescueCode,
ifnull ( jri.EQU_CODE, '' ) AS registerCode,
ifnull ( jui.USE_UNIT_NAME, '' ) AS useUnit,
ifnull ( jui.EQU_STATE,'')AS useStatus,
ifnull ( ( SELECT NAME FROM cb_data_dictionary WHERE code = jui.USE_PLACE and type = 'ADDRESS' ), '' ) AS useSiteCategory,
ifnull ( jui.ADDRESS, '' ) AS address,
ifnull ( jui.PROVINCE_NAME, '' ) AS province,
ifnull ( jui.CITY_NAME, '' ) AS city,
ifnull ( jui.COUNTY_NAME, '' ) AS district,
concat(jui.PROVINCE, '#',jui.CITY, '#',jui.COUNTY) AS regionCode
FROM
idx_biz_jg_use_info jui
LEFT JOIN idx_biz_jg_other_info joi ON jui.RECORD = joi.RECORD
LEFT JOIN idx_biz_jg_register_info jri ON jri.RECORD = jui.RECORD
WHERE
jri.EQU_LIST = '3000'
<if test="elevator.rescueCode!=null and elevator.rescueCode!='' ">
AND joi.CODE96333 = #{elevator.rescueCode}
</if>
<if test="elevator.registerCode!=null and elevator.registerCode!='' ">
AND jri.EQU_CODE = #{elevator.registerCode}
</if>
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/AlertCalledController.java
View file @ 89342b18
......@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.elevator.biz.utils.BeanDtoVoUtils;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.slf4j.Logger;
......@@ -125,8 +126,10 @@ public class AlertCalledController extends BaseController {
LambdaQueryWrapper<Elevator> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Elevator::getRescueCode,alertCalledObjsDto.getAlertCalledDto().getDeviceId());
Elevator elevator = iElevatorService.getOne(queryWrapper);
if(elevator == null) {
Elevator elevator = new Elevator();
elevator.setRescueCode(Integer.valueOf(alertCalledObjsDto.getAlertCalledDto().getDeviceId()));
Map<String,Object> map = iElevatorService.selectElevatorList(elevator);
if(ObjectUtils.isEmpty(map)) {
throw new BadRequest("未找到相关电梯.");
}
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/ElevatorController.java
View file @ 89342b18
......@@ -217,47 +217,50 @@ public class ElevatorController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/page/similar", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "相似电梯模糊查询", notes = "相似电梯模糊查询")
public ResponseModel<List<ElevatorDto>> similar(@RequestBody ElevatorNewDto elevatorNewDto) {
public ResponseModel<List<Map<String,Object>>> similar(@RequestBody ElevatorNewDto elevatorNewDto) {
Elevator elevator = BeanDtoVoUtils.convert(elevatorNewDto.getElevatorDto(), Elevator.class);
QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
Class<? extends Elevator> aClass = elevator.getClass();
Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
try {
field.setAccessible(true);
Object o = field.get(elevator);
if (o != null) {
String name = NameUtils.camel2Underline(field.getName());
if ("rescue_code".equalsIgnoreCase(name)) {
Integer fileValue = (Integer) o;
elevatorQueryWrapper.like(name, fileValue);
} else if ("city".equalsIgnoreCase(name) || "district".equalsIgnoreCase(name)) {
String fileValue = (String) o;
elevatorQueryWrapper.eq(name, fileValue);
} else {
String fileValue = (String) o;
elevatorQueryWrapper.like(name, fileValue);
}
}
} catch (Exception e) {
logger.error(e.getMessage());
}
});
List<Elevator> elevators = iElevatorService.list(elevatorQueryWrapper);
List<ElevatorDto> elevatorDtoList = new ArrayList<>();
for (Elevator ele : elevators ) {
ElevatorDto eleDto = new ElevatorDto();
BeanUtils.copyProperties(ele,eleDto);
if(!ValidationUtil.isEmpty(eleDto.getUseSiteCategory())) {
LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(DataDictionary::getCode, eleDto.getUseSiteCategory());
DataDictionary dataDictionary = iDataDictionaryService.getOne(wrapper);
if (!ValidationUtil.isEmpty(dataDictionary)) {
eleDto.setUseSiteCategory(dataDictionary.getName());
}
}
elevatorDtoList.add(eleDto);
}
return ResponseHelper.buildResponse(elevatorDtoList);
// QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
// Class<? extends Elevator> aClass = elevator.getClass();
// Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
// try {
// field.setAccessible(true);
// Object o = field.get(elevator);
// if (o != null) {
// String name = NameUtils.camel2Underline(field.getName());
// if ("rescue_code".equalsIgnoreCase(name)) {
// Integer fileValue = (Integer) o;
// elevatorQueryWrapper.like(name, fileValue);
// } else if ("city".equalsIgnoreCase(name) || "district".equalsIgnoreCase(name)) {
// String fileValue = (String) o;
// elevatorQueryWrapper.eq(name, fileValue);
// } else {
// String fileValue = (String) o;
// elevatorQueryWrapper.like(name, fileValue);
// }
// }
// } catch (Exception e) {
// logger.error(e.getMessage());
// }
// });
// List<Elevator> elevators = iElevatorService.list(elevatorQueryWrapper);
Map<String,Object> map = iElevatorService.selectElevatorList(elevator);
// List<ElevatorDto> elevatorDtoList = new ArrayList<>();
// for (Elevator ele : elevators ) {
// ElevatorDto eleDto = new ElevatorDto();
// BeanUtils.copyProperties(ele,eleDto);
// if(!ValidationUtil.isEmpty(eleDto.getUseSiteCategory())) {
// LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(DataDictionary::getCode, eleDto.getUseSiteCategory());
// DataDictionary dataDictionary = iDataDictionaryService.getOne(wrapper);
// if (!ValidationUtil.isEmpty(dataDictionary)) {
// eleDto.setUseSiteCategory(dataDictionary.getName());
// }
// }
// elevatorDtoList.add(eleDto);
// }
List<Map<String,Object>> list = new ArrayList<>();
list.add(map);
return ResponseHelper.buildResponse(list);
}
/**
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java
View file @ 89342b18
......@@ -27,6 +27,7 @@ import com.yeejoin.amos.boot.module.elevator.api.service.TzsAuthService;
import com.yeejoin.amos.boot.module.elevator.biz.utils.BeanDtoVoUtils;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.apache.commons.lang.text.StrBuilder;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.BeanUtils;
......@@ -534,13 +535,17 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
alertCalled.setAlertStageCode(AlertStageEnums.JJ.getId());
alertCalled.setType(AlertStageEnums.JQCB.getValue());
alertCalled.setTypeCode(AlertStageEnums.JQCB.getId());
LambdaQueryWrapper<Elevator> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Elevator::getRescueCode,alertCalled.getDeviceId());
Elevator elevator = iElevatorService.getOne(queryWrapper);
alertCalled.setEquipmentId(elevator.getSequenceNbr());
alertCalled.setCity(elevator.getCity());
alertCalled.setDistrict(elevator.getDistrict());
alertCalled.setRegionCode(elevator.getRegionCode());
Elevator elevator = new Elevator();
elevator.setRescueCode(Integer.valueOf(alertCalledObjsDto.getAlertCalledDto().getDeviceId()));
Map<String,Object> map = iElevatorService.selectElevatorList(elevator);
if(!ObjectUtils.isEmpty(map)){
alertCalled.setEquipmentId(map.get("sequenceNbr").toString());
alertCalled.setCity(map.get("city").toString());
alertCalled.setDistrict(map.get("district").toString());
alertCalled.setRegionCode(map.get("regionCode").toString());
}
this.save(alertCalled);
// 动态表单
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/ESElevatorServiceImpl.java
View file @ 89342b18
......@@ -160,12 +160,12 @@ public class ESElevatorServiceImpl {
queryWrapper.le(AlertCalled::getCallTime, DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
}
alertCalleds = iAlertCalledService.list(queryWrapper);
List<Long> stringList = new ArrayList<>();
List<String> stringList = new ArrayList<>();
for (AlertCalled al: alertCalleds
) {
stringList.add(al.getEquipmentId());
}
List<Long> listL = stringList.stream().distinct().collect(Collectors.toList());
List<String> listL = stringList.stream().distinct().collect(Collectors.toList());
qb0.should(QueryBuilders.termsQuery("sequenceNbr", listL.toArray()));
boolMust.must(qb0);
}
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/ElevatorServiceImpl.java
View file @ 89342b18
......@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
import com.yeejoin.amos.boot.module.elevator.api.entity.ElevatorInsure;
import com.yeejoin.amos.boot.module.elevator.api.entity.ElevatorInsureRelation;
import com.yeejoin.amos.boot.module.elevator.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.elevator.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.elevator.api.enums.TzsCommonParam;
import com.yeejoin.amos.boot.module.elevator.api.mapper.ElevatorMapper;
import com.yeejoin.amos.boot.module.elevator.api.service.IElevatorInsureRelationService;
......@@ -30,6 +31,7 @@ import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
......@@ -72,6 +74,8 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
@Autowired
ElevatorInsureServiceImpl iElevatorInsureServiceImpl;
//一码通设备使用场所字典type
private static final String ADDRESS = "ADDRESS";
/**
* 保存电梯信息
......@@ -226,6 +230,12 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
}
@Override
public Map<String,Object> selectElevatorList(Elevator elevator) {
return elevatorMapper.selectElevatorList(elevator);
}
public List<ElevatorWlInfoDto> queryElevatorList(ElevatorWlInfoDto esElevatorDto) {
return elevatorMapper.queryElevatorList(esElevatorDto.getAddress(),
esElevatorDto.getRegisterCode(),esElevatorDto.getRescueCode(),
......
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