大屏日志完善

develop
fengchunyu 11 months ago
parent c649b0c53a
commit 49261bf607

@ -17,10 +17,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
@ -280,7 +277,7 @@ public class BigScreenController extends BaseController {
@PostMapping("/realTimeAlarmSituation") @PostMapping("/realTimeAlarmSituation")
@ApiOperation("实时警情") @ApiOperation("实时警情")
public AjaxResult realTimeAlarmSituation(@ApiParam @Param("时间") String time) { public AjaxResult realTimeAlarmSituation(@ApiParam @Param("时间") @RequestParam String time) {
try { try {
if (0 == NumKit.checkInt(time)) { if (0 == NumKit.checkInt(time)) {
time = "30"; time = "30";
@ -313,7 +310,7 @@ public class BigScreenController extends BaseController {
@PostMapping("/buildingInformation") @PostMapping("/buildingInformation")
@ApiOperation("楼栋信息") @ApiOperation("楼栋信息")
public AjaxResult overviewResources(@ApiParam("楼栋地址") String para) { public AjaxResult overviewResources(@ApiParam("楼栋地址") @RequestParam String para) {
try { try {
para = para.substring(0, para.indexOf("号")); para = para.substring(0, para.indexOf("号"));
MetaRealEstateInfo estateInfo = new MetaRealEstateInfo(); MetaRealEstateInfo estateInfo = new MetaRealEstateInfo();
@ -328,7 +325,7 @@ public class BigScreenController extends BaseController {
@PostMapping("/buildRealEstate") @PostMapping("/buildRealEstate")
@ApiOperation("楼栋信息:实有房屋统计") @ApiOperation("楼栋信息:实有房屋统计")
public AjaxResult buildRealEstate(@ApiParam("楼栋地址") String para) { public AjaxResult buildRealEstate(@ApiParam("楼栋地址") @RequestParam String para) {
try { try {
QueryWrapper<MetaRealEstateInfo> queryWrapper = new QueryWrapper<>(); QueryWrapper<MetaRealEstateInfo> queryWrapper = new QueryWrapper<>();
@ -358,7 +355,7 @@ public class BigScreenController extends BaseController {
@PostMapping("/buildRealActual") @PostMapping("/buildRealActual")
@ApiOperation("楼栋信息:实有人口统计") @ApiOperation("楼栋信息:实有人口统计")
public AjaxResult buildRealActual(@ApiParam("楼栋地址") String para) { public AjaxResult buildRealActual(@ApiParam("楼栋地址") @RequestParam String para) {
try { try {
// 创建查询条件,使用模糊查询 // 创建查询条件,使用模糊查询
@ -424,7 +421,9 @@ public class BigScreenController extends BaseController {
@PostMapping("/buildStructure") @PostMapping("/buildStructure")
@ApiOperation("楼栋信息:房屋结构") @ApiOperation("楼栋信息:房屋结构")
public AjaxResult buildStructure(@ApiParam("楼栋地址") String para, @ApiParam("单元") String unit) { public AjaxResult buildStructure(
@ApiParam(value = "楼栋地址" ) @RequestParam String para,
@ApiParam(value = "单元") @RequestParam String unit) {
try { try {
//获取到房屋数据的实际地址 //获取到房屋数据的实际地址
para = para.substring(0, para.indexOf("号")); para = para.substring(0, para.indexOf("号"));
@ -470,7 +469,7 @@ public class BigScreenController extends BaseController {
@PostMapping("/buildInformation") @PostMapping("/buildInformation")
@ApiOperation("楼栋信息:户室信息") @ApiOperation("楼栋信息:户室信息")
public AjaxResult buildInformation(@ApiParam("楼栋地址") String para) { public AjaxResult buildInformation(@ApiParam("楼栋地址") @RequestParam String para) {
try { try {
QueryWrapper<MetaRealEstateInfo> addQueryWrapper = new QueryWrapper<>(); QueryWrapper<MetaRealEstateInfo> addQueryWrapper = new QueryWrapper<>();

@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
* (MetaActualUnitUserInfo)Domain * (MetaActualUnitUserInfo)Domain
* *
* @author makejava * @author makejava
* @since 2023-12-01 20:06:02 * @since 2023-12-20 11:53:49
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ -37,7 +37,7 @@ public class MetaActualUnitUserInfo extends BaseEntity {
*/ */
@ApiModelProperty("单位id") @ApiModelProperty("单位id")
@Excel(name = "单位id") @Excel(name = "单位id")
private Long unitId; private String unitId;
/** /**
* *

Loading…
Cancel
Save