Commit ac1f0544 authored by tangwei's avatar tangwei

整理接口

parent 3e6fc723
......@@ -23,13 +23,14 @@ import java.util.List;
import java.util.stream.Collectors;
/**
* 警情表单 服务实现类
*
* @author tb
* @date 2021-06-17
*/
* 警情表单 服务实现类
*
* @author tb
* @date 2021-06-17
*/
@Service
public class AlertFormServiceImpl extends BaseService<AlertFormDto,AlertForm,AlertFormMapper> implements IAlertFormService{
public class AlertFormServiceImpl extends BaseService<AlertFormDto, AlertForm, AlertFormMapper>
implements IAlertFormService {
@Autowired
DataDictionaryServiceImpl iDataDictionaryService;
......@@ -42,13 +43,15 @@ public class AlertFormServiceImpl extends BaseService<AlertFormDto,AlertForm,Ale
List<AlertFormInitDto> listfrom = new ArrayList<AlertFormInitDto>();
// 组装数据
for (AlertForm alertFrom : alertFormValue) {
if(alertFrom.getFieldType().equals("string")||alertFrom.getFieldType().equals("datetime")||alertFrom.getFieldType().equals("textarea")||alertFrom.getFieldType().equals("inputBitmap")) {
if (alertFrom.getFieldType().equals("string") || alertFrom.getFieldType().equals("datetime")
|| alertFrom.getFieldType().equals("textarea") || alertFrom.getFieldType().equals("inputBitmap")) {
AlertFormInitDto vo = new AlertFormInitDto(alertFrom.getFieldCode(), alertFrom.getFieldName(),
alertFrom.getFieldType(), null, alertFrom.getUrl());
AlertFormValue alertFormValu = new AlertFormValue(alertFrom.getSequenceNbr(), alertFrom.getFieldName(),
alertFrom.getFieldCode(), alertFrom.getBlock(), alertFrom.getAlertTypeCode(), null, null);
AlertFormInitDto vo = new AlertFormInitDto(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), null,alertFrom.getUrl());
AlertFormValue alertFormValu= new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock(), alertFrom.getAlertTypeCode(),null, null);
if(alertFrom.getFieldType().equals("datetime")) {
if (alertFrom.getFieldType().equals("datetime")) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = new Date();
String dateString = formatter.format(date);
......@@ -57,16 +60,18 @@ public class AlertFormServiceImpl extends BaseService<AlertFormDto,AlertForm,Ale
}
vo.setFormItemDescr(alertFormValu);
listfrom.add(vo);
}else {
} else {
// 查询数据项
QueryWrapper<DataDictionary> queryWrappercolumnMap = new QueryWrapper<>();
queryWrappercolumnMap.eq("type", alertFrom.getFieldValueCode());
queryWrappercolumnMap.orderByAsc("sort_num");
Collection<DataDictionary> listDataDictionary = iDataDictionaryService.list(queryWrappercolumnMap);
List<AlertListvalue> list=getdata(listDataDictionary);
AlertFormInitDto vo = new AlertFormInitDto(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), new Items(list),alertFrom.getUrl());
AlertFormValue alertFormValu= new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock(), alertFrom.getAlertTypeCode(),null, null);
if(alertFrom.getFieldType().equals("radio")){
List<AlertListvalue> list = getdata(listDataDictionary);
AlertFormInitDto vo = new AlertFormInitDto(alertFrom.getFieldCode(), alertFrom.getFieldName(),
alertFrom.getFieldType(), new Items(list), alertFrom.getUrl());
AlertFormValue alertFormValu = new AlertFormValue(alertFrom.getSequenceNbr(), alertFrom.getFieldName(),
alertFrom.getFieldCode(), alertFrom.getBlock(), alertFrom.getAlertTypeCode(), null, null);
if (alertFrom.getFieldType().equals("radio")) {
vo.setDefaultValue(list.get(0).getValue());
alertFormValu.setFieldValue(list.get(0).getLabel());
alertFormValu.setFieldValueCode(list.get(0).getValue());
......@@ -84,7 +89,7 @@ public class AlertFormServiceImpl extends BaseService<AlertFormDto,AlertForm,Ale
for (DataDictionary dataDictionary : list) {
listAlertListvalue.add(new AlertListvalue(dataDictionary.getSequenceNbr().toString(),
dataDictionary.getName(),dataDictionary.getCode()));
dataDictionary.getName(), dataDictionary.getCode()));
}
return listAlertListvalue;
}
......
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