Skip to content

A
amos-boot-biz
Commit aaa926fe authored by xinglei's avatar xinglei
Browse files
Options

*）增加boolean类型

parent 204cd27f
Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 184 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java
View file @ aaa926fe
...@@ -19,12 +19,15 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService; ...@@ -19,12 +19,15 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled; import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils; import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
...@@ -44,188 +47,191 @@ import java.util.List; ...@@ -44,188 +47,191 @@ import java.util.List;
@RequestMapping(value = "/jcs/alert-called") @RequestMapping(value = "/jcs/alert-called")
public class AlertCalledController extends BaseController { public class AlertCalledController extends BaseController {
@Autowired @Autowired
IAlertCalledService iAlertCalledService; IAlertCalledService iAlertCalledService;
@Autowired @Autowired
IAlertFormValueService iAlertFormValueService; IAlertFormValueService iAlertFormValueService;
/** /**
* 新增警情接警记录 * 新增警情接警记录
* *
* @return * @return
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增警情接警记录", notes = "新增警情接警记录") @ApiOperation(httpMethod = "POST", value = "新增警情接警记录", notes = "新增警情接警记录")
@Transactional @Transactional
public ResponseModel saveAlertCalled(HttpServletRequest request, @RequestBody AlertCalledVo alertCalledVo) { public ResponseModel saveAlertCalled(HttpServletRequest request, @RequestBody AlertCalledVo alertCalledVo) {
// 警情基本信息 // 警情基本信息
AlertCalled alertCalled = alertCalledVo.getAlertCalled(); AlertCalled alertCalled = alertCalledVo.getAlertCalled();
// 判断是否归并警情 // 判断是否归并警情
if (alertCalled.getFatherAlert() != null) { if (alertCalled.getFatherAlert() != null) {
// 警情归并，设置当前警情状态为结束。 // 警情归并，设置当前警情状态为结束。
alertCalled.setAlertStatus(true); alertCalled.setAlertStatus(true);
} else { } else {
// 警情报送 // 警情报送
// ****************************************************待确认开发 // ****************************************************待确认开发
} }
iAlertCalledService.save(alertCalled); iAlertCalledService.save(alertCalled);
// 动态表单 // 动态表单
List<AlertFormValue> alertFormValuelist = alertCalledVo.getAlertFormValue(); List<AlertFormValue> alertFormValuelist = alertCalledVo.getAlertFormValue();
// 填充警情主键 // 填充警情主键
alertFormValuelist.stream().forEach(alertFormValue -> { alertFormValuelist.stream().forEach(alertFormValue -> {
alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr()); alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr());
}); });
// 保存动态表单数据 // 保存动态表单数据
iAlertFormValueService.saveBatch(alertFormValuelist); iAlertFormValueService.saveBatch(alertFormValuelist);
iAlertCalledService.save(alertCalled); iAlertCalledService.save(alertCalled);
return CommonResponseUtil.success(alertCalledVo); return CommonResponseUtil.success(alertCalledVo);
} }
/** /**
* 根据id删除 * 根据id删除
* *
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id) { public boolean deleteById(HttpServletRequest request, @PathVariable Long id) {
return iAlertCalledService.removeById(id); return iAlertCalledService.removeById(id);
} }
/** /**
* 修改警情接警记录 * 修改警情接警记录
* *
* @return * @return
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改警情接警记录", notes = "修改警情接警记录") @ApiOperation(httpMethod = "PUT", value = "修改警情接警记录", notes = "修改警情接警记录")
public boolean updateByIdAlertCalled(HttpServletRequest request, @RequestBody AlertCalled alertCalled) { public boolean updateByIdAlertCalled(HttpServletRequest request, @RequestBody AlertCalled alertCalled) {
return iAlertCalledService.updateById(alertCalled); return iAlertCalledService.updateById(alertCalled);
} }
/** /**
* 根据id查询 * 根据id查询
* *
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) { public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) {
// 警情基本信息 // 警情基本信息
AlertCalled alertCalled = iAlertCalledService.getById(id); AlertCalled alertCalled = iAlertCalledService.getById(id);
QueryWrapper queryWrapper = new QueryWrapper<>(); QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alert_called_id", id); queryWrapper.eq("alert_called_id", id);
// 警情动态表单数据 // 警情动态表单数据
List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper); List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
List<FormValue> formValue =new ArrayList(); List<FormValue> formValue = new ArrayList();
for (AlertFormValue alertFormValue:list) { for (AlertFormValue alertFormValue : list) {
FormValue value = new FormValue(alertFormValue.getFieldCode(),alertFormValue.getFieldName(),"text",alertFormValue.getFieldValue()); FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue());
formValue.add(value); formValue.add(value);
} }
AlertCalledFormVo alertCalledFormVo = new AlertCalledFormVo(alertCalled, formValue); AlertCalledFormVo alertCalledFormVo = new AlertCalledFormVo(alertCalled, formValue);
return CommonResponseUtil.success(alertCalledFormVo); return CommonResponseUtil.success(alertCalledFormVo);
} }
/** /**
* 列表分页查询 * 列表分页查询
* *
* @return * @return
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel listPage(String pageNum, String pageSize, AlertCalled alertCalled) { public ResponseModel listPage(String pageNum, String pageSize, AlertCalled alertCalled) {
Page<AlertCalled> pageBean; Page<AlertCalled> pageBean;
QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>(); QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
Class<? extends AlertCalled> aClass = alertCalled.getClass(); Class<? extends AlertCalled> aClass = alertCalled.getClass();
alertCalledQueryWrapper.eq("is_delete", 0); alertCalledQueryWrapper.eq("is_delete", 0);
alertCalledQueryWrapper.orderByDesc("call_time"); alertCalledQueryWrapper.orderByDesc("call_time");
if (alertCalled.getCallTimeStart() != null && alertCalled.getCallTimeEnd() != null) { if (alertCalled.getCallTimeStart() != null && alertCalled.getCallTimeEnd() != null) {
alertCalledQueryWrapper.between("call_time", alertCalled.getCallTimeStart(), alertCalled.getCallTimeEnd()); alertCalledQueryWrapper.between("call_time", alertCalled.getCallTimeStart(), alertCalled.getCallTimeEnd());
} }
if(alertCalled.getIsFatherAlert()) { if (!ValidationUtil.isEmpty(alertCalled.getIsFatherAlert())) {
alertCalledQueryWrapper.isNull("father_alert"); alertCalledQueryWrapper.isNull("father_alert");
} }
Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
try {
Arrays.stream(aClass.getDeclaredFields()).forEach(field -> { field.setAccessible(true);
try { Object o = field.get(alertCalled);
field.setAccessible(true); if (o != null) {
Object o = field.get(alertCalled); Class<?> type = field.getType();
if (o != null) { String name = NameUtils.camel2Underline(field.getName());
Class<?> type = field.getType(); if (type.equals(Integer.class)) {
String name = NameUtils.camel2Underline(field.getName()); Integer fileValue = (Integer) field.get(alertCalled);
if (type.equals(Integer.class)) { alertCalledQueryWrapper.eq(name, fileValue);
Integer fileValue = (Integer) field.get(alertCalled); } else if (type.equals(String.class)) {
alertCalledQueryWrapper.eq(name, fileValue); String fileValue = (String) field.get(alertCalled);
} else if (type.equals(String.class)) { alertCalledQueryWrapper.eq(name, fileValue);
String fileValue = (String) field.get(alertCalled); } else if (type.equals(Boolean.class)) {
alertCalledQueryWrapper.eq(name, fileValue); Boolean fileValue = (Boolean) field.get(alertCalled);
} alertCalledQueryWrapper.eq(name, fileValue);
} }
} catch (Exception e) { }
e.printStackTrace(); } catch (Exception e) {
throw new RuntimeException("系统异常"); e.printStackTrace();
} throw new RuntimeException("系统异常");
}); }
IPage<AlertCalled> page; });
if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) { IPage<AlertCalled> page;
pageBean = new Page<>(0, Long.MAX_VALUE); if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
} else { pageBean = new Page<>(0, Long.MAX_VALUE);
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize)); } else {
} pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper); }
return CommonResponseUtil.success(page); page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
} return CommonResponseUtil.success(page);
}
/**
* 列表无分页查询 /**
* * 列表无分页查询
* @return *
*/ * @return
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) */
@RequestMapping(value = "/getList", method = RequestMethod.GET) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表无分页查询", notes = "列表无分页查询") @RequestMapping(value = "/getList", method = RequestMethod.GET)
public ResponseModel list(AlertCalled alertCalled) { @ApiOperation(httpMethod = "GET", value = "列表无分页查询", notes = "列表无分页查询")
QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>(); public ResponseModel list(AlertCalled alertCalled) {
Class<? extends AlertCalled> aClass = alertCalled.getClass(); QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
alertCalledQueryWrapper.eq("is_delete", 0); Class<? extends AlertCalled> aClass = alertCalled.getClass();
alertCalledQueryWrapper.orderByDesc("call_time"); alertCalledQueryWrapper.eq("is_delete", 0);
if (alertCalled.getCallTimeStart() != null && alertCalled.getCallTimeEnd() != null) { alertCalledQueryWrapper.orderByDesc("call_time");
alertCalledQueryWrapper.between("call_time", alertCalled.getCallTimeStart(), alertCalled.getCallTimeEnd()); if (alertCalled.getCallTimeStart() != null && alertCalled.getCallTimeEnd() != null) {
} alertCalledQueryWrapper.between("call_time", alertCalled.getCallTimeStart(), alertCalled.getCallTimeEnd());
}
if(alertCalled.getIsFatherAlert()) { if (!ValidationUtil.isEmpty(alertCalled.getIsFatherAlert())) {
alertCalledQueryWrapper.isNull("father_alert"); alertCalledQueryWrapper.isNull("father_alert");
} }
Arrays.stream(aClass.getDeclaredFields()).forEach(field -> { Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
try { try {
field.setAccessible(true); field.setAccessible(true);
Object o = field.get(alertCalled); Object o = field.get(alertCalled);
if (o != null) { if (o != null) {
Class<?> type = field.getType(); Class<?> type = field.getType();
String name = NameUtils.camel2Underline(field.getName()); String name = NameUtils.camel2Underline(field.getName());
if (type.equals(Integer.class)) { if (type.equals(Integer.class)) {
Integer fileValue = (Integer) field.get(alertCalled); Integer fileValue = (Integer) field.get(alertCalled);
alertCalledQueryWrapper.eq(name, fileValue); alertCalledQueryWrapper.eq(name, fileValue);
} else if (type.equals(String.class)) { } else if (type.equals(String.class)) {
String fileValue = (String) field.get(alertCalled); String fileValue = (String) field.get(alertCalled);
alertCalledQueryWrapper.eq(name, fileValue); alertCalledQueryWrapper.eq(name, fileValue);
} } else if (type.equals(Boolean.class)) {
} Boolean fileValue = (Boolean) field.get(alertCalled);
} catch (Exception e) { alertCalledQueryWrapper.eq(name, fileValue);
e.printStackTrace(); }
throw new RuntimeException("系统异常"); }
} } catch (Exception e) {
}); e.printStackTrace();
List<AlertCalled> list = iAlertCalledService.list(alertCalledQueryWrapper); throw new RuntimeException("系统异常");
return CommonResponseUtil.success(list); }
} });
List<AlertCalled> list = iAlertCalledService.list(alertCalledQueryWrapper);
return CommonResponseUtil.success(list);
}
} }
\ No newline at end of file
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